Closes #mihonapp/mihon1436 Closes #mihonapp/mihon1486 (cherry picked from commit dcddac5daaff3ec89c8507c35dc13d345ffdb6d7)