rebase fix + added @since for new function