Prince igor maps kingdom

Pull request created to have on preview on monday changes made for MOB-2062 and MOB-2232